wolfSSL_X509_verify_cert: add host check from ctx->param#9952
Open
julek-wolfssl wants to merge 3 commits intowolfSSL:masterfrom
Open
wolfSSL_X509_verify_cert: add host check from ctx->param#9952julek-wolfssl wants to merge 3 commits intowolfSSL:masterfrom
ctx->param#9952julek-wolfssl wants to merge 3 commits intowolfSSL:masterfrom
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adds OpenSSL-compatible hostname/IP enforcement to wolfSSL_X509_verify_cert() based on values set in WOLFSSL_X509_STORE_CTX->param, and introduces a regression test to ensure hostname mismatches are rejected.
Changes:
- Enforce hostname (
hostName) and IP (ipasc) checks duringwolfSSL_X509_verify_cert()when configured viaX509_VERIFY_PARAM. - Add a regression test that verifies hostname match/mismatch behavior and the resulting error code.
- Register the new test in the API test declarations.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
src/x509_str.c |
Adds hostname/IP enforcement to wolfSSL_X509_verify_cert() when ctx->param is configured. |
tests/api/test_x509.c |
Adds a regression test covering success with no hostname, success with matching SAN DNS, and failure on mismatch. |
tests/api/test_x509.h |
Exposes and registers the new test in the x509 test group. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
You can also share your feedback on Copilot code review. Take the survey.
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
You can also share your feedback on Copilot code review. Take the survey.
Comment on lines
+302
to
+305
| ExpectIntNE(wolfSSL_X509_verify_cert(ctx), WOLFSSL_SUCCESS); | ||
| ExpectIntEQ(wolfSSL_X509_STORE_CTX_get_error(ctx), | ||
| X509_V_ERR_HOSTNAME_MISMATCH); | ||
| ExpectIntEQ(wolfSSL_X509_STORE_CTX_get_error_depth(ctx), 0); |
Comment on lines
+743
to
+772
| /* Enforce hostname / IP verification from X509_VERIFY_PARAM if set. */ | ||
| if (ret == WOLFSSL_SUCCESS && ctx->param != NULL) { | ||
| if (ctx->param->hostName[0] != '\0') { | ||
| if (wolfSSL_X509_check_host(ctx->current_cert, | ||
| ctx->param->hostName, | ||
| XSTRLEN(ctx->param->hostName), | ||
| ctx->param->hostFlags, NULL) != WOLFSSL_SUCCESS) { | ||
| #ifndef OPENSSL_COEXIST | ||
| ctx->error = X509_V_ERR_HOSTNAME_MISMATCH; | ||
| #else | ||
| ctx->error = 1; /* Return generic error */ | ||
| #endif | ||
| ctx->error_depth = 0; | ||
| ret = WOLFSSL_FAILURE; | ||
| } | ||
| } | ||
| else if (ctx->param->ipasc[0] != '\0') { | ||
| if (wolfSSL_X509_check_ip_asc(ctx->current_cert, | ||
| ctx->param->ipasc, | ||
| ctx->param->hostFlags) != WOLFSSL_SUCCESS) { | ||
| #ifndef OPENSSL_COEXIST | ||
| ctx->error = X509_V_ERR_IP_ADDRESS_MISMATCH; | ||
| #else | ||
| ctx->error = 1; /* Return generic error */ | ||
| #endif | ||
| ctx->error_depth = 0; | ||
| ret = WOLFSSL_FAILURE; | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
ZD21324